set upper member of vadjustment correct, so the vscrollbars of lists

Sat Feb  2 18:07:51 2002  Kristian Rietveld  <kris@gtk.org>

        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): set upper member
        of vadjustment correct, so the vscrollbars of lists smaller than
        1 page are somewhat saner (#66905)

        * gtk/gtkliststore.c (gtk_list_store_remove_silently): do not
        increment the stamp, liststore is a model with persisting iters

diff --git a/ChangeLog b/ChangeLog
index 2ad5e94d5ae1e45fd8493c508962a918f9fad5ad..5315a4c9cf0a0b255a99fc1b640573822a720635 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sat Feb  2 18:07:51 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_allocate): set upper member
+       of vadjustment correct, so the vscrollbars of lists smaller than
+       1 page are somewhat saner (#66905)
+
+       * gtk/gtkliststore.c (gtk_list_store_remove_silently): do not
+       increment the stamp, liststore is a model with persisting iters
+
 Fri Feb  1 23:54:00 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.[ch] (gtk_rc_parse_engine): Support 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 2ad5e94d5ae1e45fd8493c508962a918f9fad5ad..5315a4c9cf0a0b255a99fc1b640573822a720635 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+Sat Feb  2 18:07:51 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_allocate): set upper member
+       of vadjustment correct, so the vscrollbars of lists smaller than
+       1 page are somewhat saner (#66905)
+
+       * gtk/gtkliststore.c (gtk_list_store_remove_silently): do not
+       increment the stamp, liststore is a model with persisting iters
+
 Fri Feb  1 23:54:00 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.[ch] (gtk_rc_parse_engine): Support 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2ad5e94d5ae1e45fd8493c508962a918f9fad5ad..5315a4c9cf0a0b255a99fc1b640573822a720635 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Sat Feb  2 18:07:51 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_allocate): set upper member
+       of vadjustment correct, so the vscrollbars of lists smaller than
+       1 page are somewhat saner (#66905)
+
+       * gtk/gtkliststore.c (gtk_list_store_remove_silently): do not
+       increment the stamp, liststore is a model with persisting iters
+
 Fri Feb  1 23:54:00 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.[ch] (gtk_rc_parse_engine): Support 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2ad5e94d5ae1e45fd8493c508962a918f9fad5ad..5315a4c9cf0a0b255a99fc1b640573822a720635 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+Sat Feb  2 18:07:51 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_allocate): set upper member
+       of vadjustment correct, so the vscrollbars of lists smaller than
+       1 page are somewhat saner (#66905)
+
+       * gtk/gtkliststore.c (gtk_list_store_remove_silently): do not
+       increment the stamp, liststore is a model with persisting iters
+
 Fri Feb  1 23:54:00 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.[ch] (gtk_rc_parse_engine): Support 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2ad5e94d5ae1e45fd8493c508962a918f9fad5ad..5315a4c9cf0a0b255a99fc1b640573822a720635 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Sat Feb  2 18:07:51 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_allocate): set upper member
+       of vadjustment correct, so the vscrollbars of lists smaller than
+       1 page are somewhat saner (#66905)
+
+       * gtk/gtkliststore.c (gtk_list_store_remove_silently): do not
+       increment the stamp, liststore is a model with persisting iters
+
 Fri Feb  1 23:54:00 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.[ch] (gtk_rc_parse_engine): Support 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2ad5e94d5ae1e45fd8493c508962a918f9fad5ad..5315a4c9cf0a0b255a99fc1b640573822a720635 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Sat Feb  2 18:07:51 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_allocate): set upper member
+       of vadjustment correct, so the vscrollbars of lists smaller than
+       1 page are somewhat saner (#66905)
+
+       * gtk/gtkliststore.c (gtk_list_store_remove_silently): do not
+       increment the stamp, liststore is a model with persisting iters
+
 Fri Feb  1 23:54:00 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.[ch] (gtk_rc_parse_engine): Support 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2ad5e94d5ae1e45fd8493c508962a918f9fad5ad..5315a4c9cf0a0b255a99fc1b640573822a720635 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Sat Feb  2 18:07:51 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_allocate): set upper member
+       of vadjustment correct, so the vscrollbars of lists smaller than
+       1 page are somewhat saner (#66905)
+
+       * gtk/gtkliststore.c (gtk_list_store_remove_silently): do not
+       increment the stamp, liststore is a model with persisting iters
+
 Fri Feb  1 23:54:00 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.[ch] (gtk_rc_parse_engine): Support 

diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index ec32660207c4eff31b3df2489d6e928dfb96da68..475a4ceb376dbc8af681914e81fbbe42c045d015 100644 (file)
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -962,8 +962,6 @@ gtk_list_store_remove_silently (GtkListStore *list_store,
     if (iter->user_data == list_store->tail)
       list_store->tail = prev;
   }
-
-  list_store->stamp ++;
 }
 
 /**

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index c5a6319739d32f85025420b52ea818a5870659ca..4e0763ac5465688e38800faf1bedfc3acd2ffb10 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1604,7 +1604,7 @@ gtk_tree_view_size_allocate (GtkWidget     *widget,
   tree_view->priv->vadjustment->step_increment = (tree_view->priv->vadjustment->page_size) / 10;
   tree_view->priv->vadjustment->page_increment = (allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view)) / 2;
   tree_view->priv->vadjustment->lower = 0;
-  tree_view->priv->vadjustment->upper = tree_view->priv->height;
+  tree_view->priv->vadjustment->upper = MAX (tree_view->priv->vadjustment->page_size, tree_view->priv->height);
 
   if (tree_view->priv->vadjustment->value + allocation->height > tree_view->priv->height)
     gtk_adjustment_set_value (tree_view->priv->vadjustment,